From: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date: Tue, 5 Dec 2017 01:45:35 +0000 (-0500)
Subject: dash: Make sure item labels are only destroyed once
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~994^2^2~139
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6c655a6c717fb47ea3e97a411ba35d402b3b0025;p=gnome-shell.git

dash: Make sure item labels are only destroyed once

Labels are currently destroyed from both animateOutAndDestroy()
and destroy(), which now (rightfully) triggers a gjs warning. As
the label is created unconditionally since commit 36e5ae4a250,
mirror that and always release it in destroy() and hide it
elsewhere.

https://bugzilla.gnome.org/show_bug.cgi?id=791233
---

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 0c89545a2..b89040bb6 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -178,15 +178,12 @@ var DashItemContainer = new Lang.Class({
     },
 
     destroy: function() {
-        if (this.label)
-            this.label.destroy();
-
+        this.label.destroy();
         this.parent();
     },
 
     animateOutAndDestroy: function() {
-        if (this.label)
-            this.label.destroy();
+        this.label.hide();
 
         if (this.child == null) {
             this.destroy();